Feat: [Adjust_QT5] Add code to adjust QT5#314
Merged
deepin-bot[bot] merged 1 commit intolinuxdeepin:develop/snipefrom Nov 20, 2025
Merged
Feat: [Adjust_QT5] Add code to adjust QT5#314deepin-bot[bot] merged 1 commit intolinuxdeepin:develop/snipefrom
deepin-bot[bot] merged 1 commit intolinuxdeepin:develop/snipefrom
Conversation
-- Add code to adjust QT5 Log: add feature Task: https://pms.uniontech.com/task-view-383493.html
Reviewer's guide (collapsed on small PRs)Reviewer's GuideIntroduce conditional compilation for QT version compatibility by guarding new child process modifier setup calls for QT6+ and aligning enterEvent overload signatures to QT5 or QT6 APIs. Class diagram for PreviousLabel changes (QT5/QT6 compatibility)classDiagram
class PreviousLabel {
+paintEvent(QPaintEvent *e)
+mouseDoubleClickEvent(QMouseEvent *event)
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+enterEvent(QEvent *event)
#else
+enterEvent(QEnterEvent *event)
#endif
+leaveEvent(QEvent *event)
+focusInEvent(QFocusEvent *event)
+focusOutEvent(QFocusEvent *event)
}
Class diagram for KPtyProcess changes (QT6 child process modifier)classDiagram
class KPtyProcess {
+KPtyProcess(QObject *parent)
+KPtyProcess(int ptyMasterFd, QObject *parent)
+~KPtyProcess()
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+setChildProcessModifier(lambda)
#endif
}
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
deepin pr auto review我来对这段代码变更进行审查:
改进建议:
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
void enterEvent(QEvent *event) override;
#else
void enterEvent(QEnterEvent *event) override; // 修正:EnterEvent -> QEnterEvent
#endif
这些修改主要是为了适配 Qt5 和 Qt6 之间的 API 变化,整体实现是合理的,只需要修正上述提到的小问题即可。 |
lzwind
approved these changes
Nov 19, 2025
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: GongHeng2017, lzwind The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Contributor
Author
|
/merge |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
-- Add code to adjust QT5
Log: add feature
Task: https://pms.uniontech.com/task-view-383493.html
Summary by Sourcery
Add Qt version checks to support both Qt5 and Qt6, adjusting child process modifiers and widget event handling accordingly.
Enhancements: